Skip to content

docs(en): merge reactjs.org/main into zh-hans.reactjs.org/main @ 7ab1969d#1715

Merged
loveloki merged 15 commits intomainfrom
sync-7ab1969d
May 17, 2025
Merged

docs(en): merge reactjs.org/main into zh-hans.reactjs.org/main @ 7ab1969d#1715
loveloki merged 15 commits intomainfrom
sync-7ab1969d

Conversation

@docschina-bot
Copy link
Copy Markdown
Collaborator

此 PR 自动生成。

合并 reactjs/reactjs.org 的修改至本仓库(@ 7ab1969

以下文件存在冲突,可能需要重新翻译:

请解决所有冲突后提交到此 pull request,可直接在 Github 修改、切换到 sync-7ab1969d 分支进行修改或者使用 Github Desktop 拉取此 pr 修改并提交。

禁止使用 Squash Merge 来合并此 Pull Request!

使用该操作会导致上游仓库的内容丢失,并致使下一次合并产生冲突。

kosh-jp and others added 14 commits May 16, 2025 11:10
* Fix wrong documentation for effect events

* Update src/content/learn/separating-events-from-effects.md

---------

Co-authored-by: Ricky <rickhanlonii@gmail.com>
---------

Co-authored-by: Nicolas Ettlin <nicolas.ettlin@me.com>
* Remove TODO comment and convert to an issue for react-test-renderer

* Remove TODO comment and convert to an issue for react-dom/test-utils
* docs: add bsky link

rename twitter to x

* Update src/content/community/index.md

---------

Co-authored-by: Ricky <rickhanlonii@gmail.com>
@docschina-bot docschina-bot requested a review from QC-L May 16, 2025 22:22
@vercel
Copy link
Copy Markdown

vercel Bot commented May 16, 2025

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
zh-hans-react-dev ✅ Ready (Inspect) Visit Preview 💬 Add feedback May 17, 2025 3:23am

@loveloki loveloki merged commit 278f926 into main May 17, 2025
7 checks passed
@loveloki loveloki deleted the sync-7ab1969d branch May 17, 2025 03:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.